Auto merge of #2299 - retep998:staticlib-naming-fiasco, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 21 Jan 2016 00:24:30 +0000 (00:24 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Jan 2016 00:24:30 +0000 (00:24 +0000)
commit8edc4601a8413cb2b4acf78934bd6e7c536f6cd2
treefc00d638d2997f6506b4874239aecd0903b76585
parentcdbc76b558b51caec482cd6e3257e0d9876c244c
parentfd946df41ecc5fb92d06a6ee89c287c4bff5fb2e
Auto merge of #2299 - retep998:staticlib-naming-fiasco, r=alexcrichton

Required for https://github.com/rust-lang/rust/pull/29520

r? @alexcrichton